bitkeeper revision 1.1236.1.158 (424a5e40njyl8M4wEhCb_M060CCf-w)

[PATCH] libxc-x86-64-fixes.patch

Build fixes for x86-64.

Signed-off-by: Nitin Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Arun Sharma <arun.sharma@intel.com>

diff --git a/tools/libxc/xc_ptrace.c b/tools/libxc/xc_ptrace.c
index cac95cb7c41cbd122179b9e8c5b4028b540e87ff..f1d5db13f089c2f9fa940936d8a2c61f40499f88 100644 (file)
--- a/tools/libxc/xc_ptrace.c
+++ b/tools/libxc/xc_ptrace.c
@@ -281,9 +281,9 @@ xc_ptrace(enum __ptrace_request request, pid_t pid, void *addr, void *data)
                SET_PT_REGS(pt, ctxt.cpu_ctxt); 
                memcpy(data, &pt, sizeof(elf_gregset_t));
        } else if (request == PTRACE_GETFPREGS)
-           memcpy(data, &ctxt.fpu_ctxt, sizeof(elf_fpregset_t));
+           memcpy(data, &ctxt.fpu_ctxt, sizeof(ctxt.fpu_ctxt));
        else /*if (request == PTRACE_GETFPXREGS)*/
-           memcpy(data, &ctxt.fpu_ctxt, sizeof(elf_fpxregset_t));
+           memcpy(data, &ctxt.fpu_ctxt, sizeof(ctxt.fpu_ctxt));
        cr3 = ctxt.pt_base;
        regs_valid = 1;
        break;

diff --git a/tools/libxc/xc_vmx_build.c b/tools/libxc/xc_vmx_build.c
index 7b035d991ccf9cfcfce72d1e721c65bccd3f1910..8ef871c9c4d389046b513e267e884400e9439f0a 100644 (file)
--- a/tools/libxc/xc_vmx_build.c
+++ b/tools/libxc/xc_vmx_build.c
@@ -478,10 +478,18 @@ int vmx_identify(void)
 {
     int eax, ecx;
 
+#ifdef __i386__
     __asm__ __volatile__ ("pushl %%ebx; cpuid; popl %%ebx" 
                          : "=a" (eax), "=c" (ecx) 
                          : "0" (1) 
                          : "dx");
+#elif defined __x86_64__
+    __asm__ __volatile__ ("pushq %%rbx; cpuid; popq %%rbx"
+                          : "=a" (eax), "=c" (ecx)
+                          : "0" (1)
+                          : "dx");
+#endif
+
     if (!(ecx & VMX_FEATURE_FLAG)) {
         return -1;
     }